Skip to content

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Nov 12, 2021

For a long time, the Android targets had target_env="", but this changed to "gnu" in Rust 1.49.0. I tracked this down to #77729 which started setting "gnu" in the linux_base target options, and this was inherited by android_base. Then #78929 split the env into linux_gnu_base, but android_base was also changed to follow that. Android was not specifically mentioned in either pull request, so I believe this was an accident. Moving it back to linux_base will use an empty env again.

r? @Mark-Simulacrum
cc @petrochenkov

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 12, 2021
@cuviper
Copy link
Member Author

cuviper commented Nov 12, 2021

We could also consider setting it to the actual libc, i.e. "bionic", but I don't know if that should be hard-coded.

While I'm looking, it's also weird that linux_kernel_base sets "gnu", but that was already the case before #77729.

@Mark-Simulacrum
Copy link
Member

r? @petrochenkov (I'm not sure I'm the best reviewer here)

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 14, 2021

📌 Commit a24e2ed has been approved by petrochenkov

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 14, 2021
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Nov 15, 2021
Android is not GNU

For a long time, the Android targets had `target_env=""`, but this changed to `"gnu"` in Rust 1.49.0. I tracked this down to rust-lang#77729 which started setting `"gnu"` in the `linux_base` target options, and this was inherited by `android_base`. Then rust-lang#78929 split the env into `linux_gnu_base`, but `android_base` was also changed to follow that. Android was not specifically mentioned in either pull request, so I believe this was an accident. Moving it back to `linux_base` will use an empty `env` again.

r? `@Mark-Simulacrum`
cc `@petrochenkov`
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Nov 15, 2021
Android is not GNU

For a long time, the Android targets had `target_env=""`, but this changed to `"gnu"` in Rust 1.49.0. I tracked this down to rust-lang#77729 which started setting `"gnu"` in the `linux_base` target options, and this was inherited by `android_base`. Then rust-lang#78929 split the env into `linux_gnu_base`, but `android_base` was also changed to follow that. Android was not specifically mentioned in either pull request, so I believe this was an accident. Moving it back to `linux_base` will use an empty `env` again.

r? ``@Mark-Simulacrum``
cc ``@petrochenkov``
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 15, 2021
Android is not GNU

For a long time, the Android targets had `target_env=""`, but this changed to `"gnu"` in Rust 1.49.0. I tracked this down to rust-lang#77729 which started setting `"gnu"` in the `linux_base` target options, and this was inherited by `android_base`. Then rust-lang#78929 split the env into `linux_gnu_base`, but `android_base` was also changed to follow that. Android was not specifically mentioned in either pull request, so I believe this was an accident. Moving it back to `linux_base` will use an empty `env` again.

r? ```@Mark-Simulacrum```
cc ```@petrochenkov```
@petrochenkov
Copy link
Contributor

I'm also going to beta-nominate this, the change is trivial, and backporting will make the version window with incorrect behavior smaller.

@petrochenkov petrochenkov added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. regression-from-stable-to-stable Performance or correctness regression from one stable version to another. labels Nov 16, 2021
@rustbot rustbot added the I-prioritize Issue: Indicates that prioritization has been requested for this issue. label Nov 16, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 16, 2021
Rollup of 10 pull requests

Successful merges:

 - rust-lang#85766 (Stabilize File::options())
 - rust-lang#88601 (Implement `Termination` for `Result<Infallible, E>`)
 - rust-lang#90058 (Stabilize -Z strip as -C strip)
 - rust-lang#90790 (Fix standard library test with read_link)
 - rust-lang#90834 (Android is not GNU)
 - rust-lang#90835 (Rename WASI's `is_character_device` to `is_char_device`.)
 - rust-lang#90837 (Move some tests to more reasonable directories - 9)
 - rust-lang#90848 (Remove bigint_helper_methods for *signed* types)
 - rust-lang#90892 (fix ICE on Miri/CTFE copy of half a pointer)
 - rust-lang#90909 (disable portable SIMD tests in Miri)

Failed merges:

 - rust-lang#90128 (Stabilize -Z symbol-mangling-version=v0 as -C symbol-mangling-version=v0)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ed7ed5f into rust-lang:master Nov 16, 2021
@rustbot rustbot added this to the 1.58.0 milestone Nov 16, 2021
@JohnTitor JohnTitor removed the I-prioritize Issue: Indicates that prioritization has been requested for this issue. label Nov 16, 2021
@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 18, 2021
@cuviper cuviper mentioned this pull request Nov 18, 2021
@cuviper cuviper modified the milestones: 1.58.0, 1.57.0 Nov 18, 2021
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 18, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 19, 2021
[beta] backports

-  Fix assertion failures in OwnedHandle with windows_subsystem. rust-lang#88798
-  Ensure that pushing empty path works as before on verbatim paths rust-lang#89665
-  Feature gate + make must_not_suspend allow-by-default rust-lang#89826
-  Only use clone3 when needed for pidfd rust-lang#89930
-  Fix documentation header sizes rust-lang#90186
-  Fixes incorrect handling of ADT's drop requirements rust-lang#90218
-  Fix ICE when forgetting to Box a parameter to a Self::func call rust-lang#90221
-  Prevent duplicate caller bounds candidates by exposing default substs in Unevaluated rust-lang#90266
-  Update odht crate to 0.3.1 (big-endian bugfix) rust-lang#90403
-  rustdoc: Go back to loading all external crates unconditionally rust-lang#90489
-  Split doc_cfg and doc_auto_cfg features rust-lang#90502
-  Apply adjustments for field expression even if inaccessible rust-lang#90508
-  Warn for variables that are no longer captured rust-lang#90597
-  Properly register text_direction_codepoint_in_comment lint. rust-lang#90626
-  CI: Use ubuntu image to download openssl, curl sources, cacert.pem for x86 dist builds rust-lang#90457
-  Android is not GNU rust-lang#90834
-  Update llvm submodule rust-lang#90954

Additionally, this bumps the stage 0 compiler from beta to stable 1.56.1.

r? `@Mark-Simulacrum`
@cuviper cuviper deleted the android-gnu branch December 8, 2021 07:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. regression-from-stable-to-stable Performance or correctness regression from one stable version to another. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants